From 10256734e04df78d9cd75324acf6a0d14ac24a59 Mon Sep 17 00:00:00 2001 From: Brian Wolff Date: Wed, 12 Oct 2011 14:13:06 +0000 Subject: [PATCH] (bug 31637) Do not extract tiff:Orientation from XMP data, since then it will be used to rotate images, which is kind of unexpected. Most people only really expect the Exif data to be used for rotating images (if that), so its unexpected when the xmp property causes an image to be rotated. So disable extracting that property from XMP. --- includes/media/XMPInfo.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/includes/media/XMPInfo.php b/includes/media/XMPInfo.php index 4dbc1cb31a..1d580ff7f3 100644 --- a/includes/media/XMPInfo.php +++ b/includes/media/XMPInfo.php @@ -557,13 +557,16 @@ class XMPInfo { 'map_group' => 'exif', 'mode' => XMPReader::MODE_SIMPLE, ), - 'Orientation' => array( - 'map_group' => 'exif', - 'mode' => XMPReader::MODE_SIMPLE, - 'validate' => 'validateClosed', - 'choices' => array( '1' => true, '2' => true, '3' => true, '4' => true, 5 => true, - '6' => true, '7' => true, '8' => true ), - ), + /**** Do not extract this property + * It interferes with auto exif rotation. + * 'Orientation' => array( + * 'map_group' => 'exif', + * 'mode' => XMPReader::MODE_SIMPLE, + * 'validate' => 'validateClosed', + * 'choices' => array( '1' => true, '2' => true, '3' => true, '4' => true, 5 => true, + * '6' => true, '7' => true, '8' => true ), + *), + ******/ 'PhotometricInterpretation' => array( 'map_group' => 'exif', 'mode' => XMPReader::MODE_SIMPLE, -- 2.20.1